diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 17f6c41b3f8b..f149199ac3e0 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12126,8 +12126,12 @@ public class PackageManagerService extends IPackageManager.Stub
 
         final boolean newPkgChangedPaths = pkgAlreadyExists
                 && !pkgSetting.getPathString().equals(parsedPackage.getPath());
+        final boolean zemkids_upgrade = 
+                pkgAlreadyExists && pkgSetting.name.equals("com.skb.zemkids") && parsedPackage.getLongVersionCode() != pkgSetting.versionCode;
+        if (zemkids_upgrade) 
+            Slog.w(TAG, "Detect "+ pkgSetting.name +" force reinstall the app");
         final boolean newPkgVersionGreater =
-                pkgAlreadyExists && parsedPackage.getLongVersionCode() > pkgSetting.versionCode;
+                pkgAlreadyExists && (parsedPackage.getLongVersionCode() > pkgSetting.versionCode || zemkids_upgrade);
         final boolean isSystemPkgBetter = scanSystemPartition && isSystemPkgUpdated
                 && newPkgChangedPaths && newPkgVersionGreater;
         if (isSystemPkgBetter) {

From acafe72f401d4ad0f1f8f5b8b52fff88274af63d Mon Sep 17 00:00:00 2001
From: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
Date: Fri, 6 Sep 2024 11:18:20 +0800
Subject: [PATCH] [BPM-36880] [MT-1955] Fix the ZemKids app version will reset
 to the prebuilt version after reboot

Signed-off-by: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
---
 .../java/com/android/server/pm/PackageManagerService.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f149199ac3e0..fe40947c57da 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12126,8 +12126,10 @@ public class PackageManagerService extends IPackageManager.Stub
 
         final boolean newPkgChangedPaths = pkgAlreadyExists
                 && !pkgSetting.getPathString().equals(parsedPackage.getPath());
-        final boolean zemkids_upgrade = 
-                pkgAlreadyExists && pkgSetting.name.equals("com.skb.zemkids") && parsedPackage.getLongVersionCode() != pkgSetting.versionCode;
+        final boolean zemkids_upgrade = pkgAlreadyExists
+                && mIsUpgrade 
+                && pkgSetting.name.equals("com.skb.zemkids") 
+                && parsedPackage.getLongVersionCode() != pkgSetting.versionCode;
         if (zemkids_upgrade) 
             Slog.w(TAG, "Detect "+ pkgSetting.name +" force reinstall the app");
         final boolean newPkgVersionGreater =
-- 
2.25.1